Don't build HTML documentation in Architecture: any builds

With Autotools, we would have had to leave gtk-doc-tools in the
Build-Depends for gtkdocize, but with Meson we can demote it to
Build-Depends-Indep.

Promote docbook-xml and docbook-xsl to Build-Depends instead: they are
needed in all builds for the example programs' man pages. Previously,
they were pulled in by gtk-doc-tools.

diff --git a/debian/control b/debian/control
index b7db02c2fb155045244c0144fa00310929c746db..ea222eb3ad2213944644b0cf123871e7931006bb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,11 +7,12 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                at-spi2-core <!nocheck>,
                dbus <!nocheck>,
                debhelper-compat (= 12),
+               docbook-xml,
+               docbook-xsl,
                dpkg-dev (>= 1.17.14),
                gnome-pkg-tools (>= 0.11),
                gobject-introspection (>= 1.41.3),
                gsettings-desktop-schemas <!nocheck>,
-               gtk-doc-tools (>= 1.26),
                libatk-bridge2.0-dev,
                libatk1.0-dev (>= 2.15.1),
                libcairo2-dev (>= 1.14.0),
@@ -50,8 +51,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>
-Build-Depends-Indep: docbook-xml,
-                     docbook-xsl,
+Build-Depends-Indep: gtk-doc-tools (>= 1.26),
                      libatk1.0-doc,
                      libcairo2-doc,
                      libglib2.0-doc,

diff --git a/debian/control.in b/debian/control.in
index 133c0e220c5f48f320338a2749157757ea01eedf..7245ce384da2de975f62f82af7a9048af95b17df 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,11 +7,12 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                at-spi2-core <!nocheck>,
                dbus <!nocheck>,
                debhelper-compat (= 12),
+               docbook-xml,
+               docbook-xsl,
                dpkg-dev (>= 1.17.14),
                gnome-pkg-tools (>= 0.11),
                gobject-introspection (>= 1.41.3),
                gsettings-desktop-schemas <!nocheck>,
-               gtk-doc-tools (>= 1.26),
                libatk-bridge2.0-dev,
                libatk1.0-dev (>= 2.15.1),
                libcairo2-dev (>= 1.14.0),
@@ -51,8 +52,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>
-Build-Depends-Indep: docbook-xml,
-                     docbook-xsl,
+Build-Depends-Indep: gtk-doc-tools (>= 1.26),
                      libatk1.0-doc,
                      libcairo2-doc,
                      libglib2.0-doc,

diff --git a/debian/rules b/debian/rules
index 88939cb82eca126e78b3e27dd47c7bfdadf47cf1..4b178508d2c7084269c92793670d1dcfdc38a6e7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -99,7 +99,6 @@ configure_flags_common = \
 
 configure_flags_deb = \
        -Dbroadway-backend=true \
-       -Dgtk_doc=true \
        -Dinstall-tests=true \
        -Dintrospection=true \
        -Dman-pages=true \
@@ -120,6 +119,12 @@ else
 configure_flags_deb += -Dwayland-backend=false
 endif
 
+ifeq ($(filter %-doc,$(built_binaries)),)
+configure_flags_deb += -Dgtk_doc=false
+else
+configure_flags_deb += -Dgtk_doc=true
+endif
+
 configure_flags_udeb = \
        -Dbroadway-backend=false \
        -Dwayland-backend=false \